Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Tue, 20 Jul 2010 14:21:52 +0000 (14:21 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Tue, 20 Jul 2010 14:21:52 +0000 (14:21 +0000)

Trivial merge